Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 00:32:06 +0000 (00:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 00:32:06 +0000 (00:32 +0000)

Trivial merge